Revert 829e560..3c7b294

This rolls back to commit 829e5608ba5001ea89f8ecd12adfe413f72dfcc1.