Revert part of previous commit, possible bug