Revert 1725ddb..322f08c

This rolls back to commit 1725ddba2d21ddefc9a248d44a522aa99974cbcb.