Revert unnecessary strictness added in 3de85763e25931734cc0ea256f4b0e8330f61cbb