This time, the "last" vestige of the 2.1.0 version number.(cherry picked from commit 0defc6be360e9057b11d13acdd985ff7d35c1c47)