This reverts commit 4624a1e8. Causing problems downstream. (cherry picked from commit 0133cc60)
mentioned in commit 9a52ea5c