Revert "removing some apparent no-ops"

This reverts commit 7370066820db7eb6552058cea25f72dc5d733959.