Revert changes to common code that is not requried.