This accidentally got pulled in here, and is part of some other cleanup I'm doing.