Revert fda3601..35a0ad3

This rolls back to commit fda3601f4b5cb6a16b8b3cf2d12810f71865ff30.