"This can be removed after 3.1.0 is released." -- well, let's do that then.