Revert the optimization, it makes too much public