Removed patch from issue #1525176 which is now committed to core