sub! can return nil

Revert "drop one more string allocation"

This reverts commit 4d15661d6c46c86a62ee1fc358f4b3ef9dd9f2ea.
Merge pull request #12799 from arunagw/aa-av-test-fixes

Don't call sub! since it may return nil. Reverts 4d15661.