Don't cover removed method.
Merge branch '3.7'