Revert some changes that were not needed
Finished feature 61654344/release-append.