I'd rather not: this has to be merged in a 1.6 compatible codebase, so I'm trying to make my life as easy as possible :smile: