Revert previous PR