Revert spinner since defferreds didn't work