rolling back this change until I get the plugin-mapping stuff figured out, to keep the bootstrap working...