Revert "Merge branch 'options'"

This reverts commit ea808e7372571b5b201e493b2a78819bd046da1f, reversing
changes made to 900c890b30e69e0ebe010e245fe6cf90e69c4255.