Revert 17bc01f..e3aa3cf

This rolls back to commit 17bc01f8e7fbe7bc0a150378ae440c1949921259.