Backout 399362c3e135 (bug 894669) for bustage