Make consistent with 0.9.8-branch version of this file