After IRL discussions and experiments we decided to take changes as is