Revert "housekeeping"

This reverts commit cdda3110828b7ae4bf8272baac66b08b95806570.