Revert 29a59dd..540da3d

This rolls back to commit 29a59dd2ae62283ba0906016cebd7d2e11c1bb11.
push for jared
Revert 29a59dd..363b709

This rolls back to commit 29a59dd2ae62283ba0906016cebd7d2e11c1bb11.