This is why @jmarshallnz wanted to have it in a separate commit. The question is are there any addons using this?