Reverted modifications of the world class.