Sorry for the extra noise in the PR - was going to revert this before pushing but I forgot. :(