Restore soem Klimt values

Change-Id: I9e255bab360b8b12cc8384f0b818a0af871803ea