Changes according to:
https://github.com/psachin/B2G/commit/312c4e87ae31d076825bca61896290865fc21883