Revert "experimental impl of #695"

This reverts commit 5b77bc9bcdb2352d083787e6af042b12a5559eb8.