Reverted some preliminary changes.