Revert 96ac2bf..0e345e2

This rolls back to commit 96ac2bfe2a0ecac2208878285bc9fb9cfea8b7c5.
Rollback and checkmark