This is a re-implementation of work done in 497117a7 which was
overwritten by merge commit 03608c12.