reverting changes from SVN revision 134