Reverted changes

Reverted some changes caused by syncing the branches.