Revert changes caused by mistake from previous commit
Some changes from mainline was applied by mistake