Revert "Spinner Remove"

This reverts commit f7665ec3a10d8a8a2daf71a0aa511ca76187d1af.