Reverting Masterfull commit

Please revert this strange commit and reapply it to the Future branch.

Let's make sure the release is a clean one