Revert f53e6b1..93d4648

This rolls back to commit f53e6b1639fb492d3751f251ff51f43618207e13.