Undo workaround from previous commit