reverting some modifications to fix NotFoundController