Modify r244405 to clearer code, per David Blaikie suggestion.