Bug 947855 - Revert "Merge pull request #15869 from jaoo/947855" for gaia-unit bustage on TBPL.

This reverts commit 8b298d51cb928f92b216b0f47e75d224568b9dfb, reversing
changes made to 853a44a11f04974086a1105b54393a1b171db05e.