Revert d3b54bb..cebf477

This rolls back to commit d3b54bb60cb41281dc0a6a64fe584957d2c6c16a.