Find and Modify now use returnOriginal as per spec 2/2

JAVA-1523