@smn Can we merge this is in with this supposedly working code (according to travis) and I'll open an issue to fix all instances if we go to QA and it breaks?