In the interest of getting this merged more quickly, I've made the change here: 68874c8