Revert 4052445..e5a2482

This rolls back to commit 4052445d4ee8bb868e6ea2d7e63ba2ab2ae0754d.