Revert f83a2c6..7f39af8

This rolls back to commit f83a2c68334447bfbb106fdfff7c79b950d42334.
spinner