bug921588 - changes for new API

https://bugzilla.mozilla.org/show_bug.cgi?id=921588