Reverted auto type def for stupid v0.4 :(