Revert "proposed impl of #980"

This reverts commit 7060b79e1a85340facd3d129dfc73479e4009cc6.