Re-enable accidentally disabled features (#6150)

(cherry picked from commit 53975b3a20bdc63fad5d5506423473ec47c9d761)
1 file changed