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