I can revert this then you can merge the other pull request - let me know what's best.