Yep, this was accidental...do you want me to fix this and do a new pull request for this whole feature from a new branch?