backout 57213b64023b (bug 855326) for build bustage in debug builds
CLOSED TREE