The other changes relating to this were already reverted. This reverts commit 1625c7a837d73b6729f97edb32c497d289c0220c