ref #6041: revert the changes and wait for the decision of the user meeting