Revert c49f515..f1e7527

This rolls back to commit c49f51523e6c13ab6c3fce2871b0598e9c791fdb.