Back out changes to consts.