Revert "partial revert of 97ee411"

This reverts commit ec1bfc4d2555d1936c0779c0d2d7152c037b5706.