Discussed with @cpennington and @dmitchell -- going to revert this change to ease confusion, but going to do it in a separate PR into the main branch rather than tackling w/in the octopus.