Revert options to support current rendr#master