Revert "Merge Conflict Fix"

This reverts commit aa5060c4a93fc260ca298fd1afd2b0134c839374.