This portion somehow missed the cherry pick fest