Reverted some changes to fix sync issues

reverted some changes to fix sync issues