Revert from custom keepcase to standard