This needs to be reverted. Several dragged nodes, one with no obvious fix (deleted nodes, weird merges).

Reverting this changeset alone generates conflicts I couldn't resolve, so someone else will have to fix this.