Removes the flying baton of justice.
Merge pull request #5752 from Zuhayr/master

Removes the flying baton of justice.