Merging back in my previous comment-update.