Revert 32c9fc8 change