This reverts commit 0a34492f. This change turned out to be very intrusive wrt some internal projects. Reverting until this can be sorted out.