Revert "Refactor "spring" code into one method."

This reverts commit b83c71aa24983e1a8b7910cad32cb49133891e55.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I747dfc2ed63709f5f4032b4d4bd2cf3cd5d9e8ce
1 file changed