Restore code dropped in commit f25b2602dc.