revert 12ca1d9102483c71f5008de846b861de317b0f36 since it's a partial UI change.