Revert c590c6d..33555c3

This rolls back to commit c590c6dc3c405943ebc71308b50aea69427ee9ba.