I think this can be removed now (see 381d1abbd12a7fc8d70497f4735aa83fdf71ead3).