Undo #266 fix