Undo explicit search for unreplaced dynamic values.

This basically reverts the effects of commit 21859c5.