Revert an old fix