Removed legacy of 27239741cf