Revert "Merge from head fork"

Reverts arnestig/wh40k#1