Revert 31a8ce7..70aee91

This rolls back to commit 31a8ce7c7ae184fc60b31a5a0324d62907d658b4.