Reverting some changes done in previous commit, they were not actually
needed