32398f46ab
This reverts commit 606efbe70d.
This breaks building leaf port without x11 (redmine in particular)
PR: 282726
Approved by: maintainer timeout (6+ months)