Unmerge #9371. It's too unstable for develop.