Revert commits that should have been done on branch-4.5

This reverts commit dc74893622e4965a5d9ad0c6f9a9b0b43f2140ed.