Fix for upstream Spring 4.0 changes