Amending r208783 based on a suggestion by David Blaikie.