Revert "safekeeping checkin"

This reverts commit 221662e1a5434f68fadda09b942ee26af2d70c5a.