reverting ec8c7034a6dc1428a83e00c640009cb14df87ceb to bring back old behavior