mozilla-b2g/gaia — pull request #13536 by KevinGrandon (2013-11-09 00:10:41+00:00)
Title: Revert "Revert "Revert "Merge pull request #13276 from gasolin/issue-919927"""

Triple revert action!
This reverts commit 231840cb0ba4520e003b3f28d47476d9ebfe544b.

Please do not land this until I determine what's breaking on travis.