Undo JC-1486 fix