Revert. This commit causes problems for us while syncing...

This reverts commit 09ae07dca64a91cffbb25d2a547a8e018afa76ea.