Revert "Remove obsolete options"

This reverts commit 430b78f5b1ed889d8eebe00c3ae3e92050b0e77a.
Hacks to build