This second commit Fixes #3786.