Revert last commit, unfortunately didn't work in all scenarios