Back out cbd2e8c512f6 (bug 968836) for hidden bustage