Undo part of #4003 patch