Revert other two instances of fix which have already been submitted