Reverted some unintended changes.