Adds configuration cherrypicked from Chris Hunt.