Revert fc1ae45..1c4705a

This rolls back to commit fc1ae45db1183a216d68d6fac4ba587f6d9374e6.