This reverts commit abfdd65f. Revert this commit as it breaks for some users. I revert it before 17.12 rc tag. If we can fix it before 17.12 we will reactivate it