Revert "Re-enable capture'ing non-String values"

This reverts commit c2fe0938d7201d4ce0bb2f25e72bf5f70df128af.
Regression test for #18024