Revert bad fix