r20650: revert a bunch of code I didn't mean to commit yet