reverting changes from svn 328