Removing replace statement as per bug 1546