Revert Anand's patch which broke the build