Ref #3270 Fixes 3272 Remove Spring IoC when easy