Revert part of previous commit, it is too early to change