Prepare to merge into the master branch by removing the warning.

The description on what changes is to come.