Better safe then a git revert, will flag this for v2