Recreated patch to fix issue 2238135.