Fix rebase issue after 2a0054b97cfa1e434e83016b6c1d5a2fb555956f.