Revert 0072d16..0721cfe

This rolls back to commit 0072d16e435d4c0766160b92eb29f9c4aef6036f.