Revert: + Junctions (d34fb2c)