Temporary undo type-level dependency

(Does not compile on HP 2014.2.0.0)