This reverts commit 8c674283, which had been obsoleted by e69b8a75 "disabled officecfg unittest due to dependencies problems."