I did it in 6bab32d, and brewtestbot looks happy with that commit, so I think it's ready to merge.