Pulling out the patch that was from XALANJ-2133 since it caused regressions in some of the flavours of testing.