redo of 6baef03 in light of 1c3e5ee