Removed the workaround for CORE-1981.