Revert fix as it does not work correctly