Revert: A small optimization