It looks like the problem with putting back the '.entry' suffix is fixed.