Commit 8b63d02309 was reverted. This related commit must now also be reverted to avoid compilation errors. This reverts commit e8270defc9.
8b63d02309
e8270defc9