Revert dbf6d33..5c31912

This rolls back to commit dbf6d333d334b68a207f05c5f4fb16c792485a74.