Fixup commit: changes from dev-angular

The subtree should have been added back without moving HEAD – right
after the split commit.

Signed-off-by: Alex Coles <alex@alexbcoles.com>