reverted #2048 as it breaks logic in createFindCommand()

fixes #2884

added unit test to verify behavior.