Revert "Fixed merge conflict."

This reverts commit ff843eaa133ae8e067fdb51229b193651639face.