Bug 869016 - Remove promises. r=gandalf