Reverted back to older code for parity as test randomly failing