Restrict use of Spring binstubs to development

Partial revert of 7d7e47def

Fixes #1692