Back out ed63ede44a82:db85ebf7b0dc (bug 864485) for debug build bustage