revert part of 60b0ee01a47a134a002594ab746b2e52efb0d2b7 that somehow snuck in