Some parts of legacy/trac#15055 are done; I should figure out which.