The changes were incomplete and broke the reserve creation dialog, reverted for now. This reverts commit 7c0ca49d03.
7c0ca49d03