Simplify for 2.11.