Reverted part of the git conflict.