Alternative fix for problem addressed in r182233