Revert "r1.2 update changed backup registration, temporarily revert the changes and fix market restore"

This reverts commit af4139e84d1bf9162aaf48f0026d10b282fa9858.