Revert some style changes and wrong keys.