Backed out changeset 16ea65748767

Stu pointed out that this is probably not going to work. I had forgotten why
we did this in the first place.