Revert "Use angular promise"

This reverts commit 0683793a1e29c9d548fc54ed4d6bdc8a4b8cc04f.