This reverts commit 4f7b9688.

Conflicts:
	configure.ac
	scp2/InstallModule_ooo.mk

Change-Id: I5621496d70a2c493eb964c1138d310c68fa6d660