Revert "Resolve path variables using findOne "

This reverts commit c64de42166f4cbdc4093f7b8e426f6f27d20e7c7.