bug 1055211 bypassing nodes
bug 1057042 changes