Recommitting Matt's changes that I unwittingly nuked.