Revert all the changes that have been merged from better-deferred-api-13