Revert c7cb458..494880c

This rolls back to commit c7cb458d299781341dea03298bc3d53133fdd053.