Revert "Initial checkin of spring 2.0" Oops on master.

This reverts commit 1147d97eaa4eeb16c4510a472a7b3bd22d9b5717.