This reverts commit bc5d074818. It's not clear that we need these yet, so I'm going to remove them for now.
bc5d074818