This is already done since e73809a75cba30ad6872c2f9ee03f94dd7ca5c81