Reverted some premature changes.