Revert 7c06938..4dd4d51

This rolls back to commit 7c069387e6d8ad0776c11337cabbbcee5c7e5de1.