This reverts commit 240fcb40, reversing
changes made to 115bbd8a.

These two lines were removed from CE but need to stay in EE. This revert
ensures that we're up-to-date with the CE upstream but leaves the
required lines intact.