Heavy handed removal of if block, this is not related to try_files addition