Revert patch as it caused build failure