reverted to r1186 (the last one from 2012), with changes in observation files from r1192-1194 preserved