Back to 1.9 support - todo figure out how to do either or... some namespace majicks?