This reverts commit 874b1f48. A
change has been made to Spring Framework to work around the problem.
As a result, this workaround is no longer necessary.