I'll submit an updated pull request shortly adding this back in and the other feedback.