undoing the reverting of paul's commit, which got caught in my nuking of my other commits.