Doh! I took a look into other annotation.
Actually, to be consistent and follow with general purpose of this PR, it should be reverted, as it is a change since 3.0.