Revert "Bug 836365 - fix uplift bustage"

This reverts commit 93c90992792f1231c8f15447b260e29419de6ee9.