Fix #2070 by fixing up more T4MVC cruft :(

Fixes #2070