partial revert of reformatting as it breaks tests@