Revert "Backup before refactoring"

This reverts commit 61c398bdbcae1a16b2a65cfef6beebb517f9c6e1.
test revert