Build: Remove revision and patch up TYPE calls