Revert a557829..a84c63a

This rolls back to commit a557829714b1ac4d100862e205567bbbe83d9ac0.