Updated per Jeff's github comments.