Updated per David's PR comment