Revert "svn-1299"