Revert "Temp fix for core bug (getFileSearchOptions() stopped working)"

This reverts commit 0ef329b8c5f3b31b9519f0882e3d0f5409841238.

See https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/620

Change-Id: I347f0f2500b91c2afe9bcf460209e0f7daebdebd
Merge "Revert "Temp fix for core bug (getFileSearchOptions() stopped working)""