Seems reasonable. I'll revert this change and squash the commits later.

Thanks!