Backout ed0e9d2f23a0 for BUSTAGE. [r=me]