reverted previous commit per @kswedberg's feedback