Make it compatible with Spring 3.2.0 and newer