This reverts commit b89942c3. There are issues with this patch and also no tracking bug for it.
mentioned in commit fed41342