That workaround is no longer needed, see: 41f06e4bf3 (diff-a3bc2bb3148194d55f275ddbfe1f15c5d192b8b48daecdfa0419b5a965acdcb4) 41f06e4bf3 (diff-04e85177c4d15d42b1bf0fe9ffe8ef5d20cc37f6fc3ccff40003353269a85896)
41f06e4bf3 (diff-a3bc2bb3148194d55f275ddbfe1f15c5d192b8b48daecdfa0419b5a965acdcb4)
41f06e4bf3 (diff-04e85177c4d15d42b1bf0fe9ffe8ef5d20cc37f6fc3ccff40003353269a85896)