Removed obsolete code after commit d1ce4d9d8d