another rollback, but I think I may know what the problem is now
Authored by: alankrueger 2012-10-29
Parent: [r281]
Child: [r283]
