Revert previous temporary patch