Revert teeny tiny optimization