Revert abstraction since it caused problems. Keep fix for .find.