revert a fix as the feature is still required