Revert b08544d..c7801ba

This rolls back to commit b08544d563d230c5d6cca57af9ab149c14c465af.