Revert 4620f52..72b6219

This rolls back to commit 4620f52a61f48928907083de75cf159edfdd8eaf.