Removing the claimed deferred support

Because it does not work, deferred expects an array as a result
Merge branch 'hotfix/0.2.1'