See attached patch and commit message.