Let's be consistent and put all definitions in the options block. (cherry picked from commit 14389bc446)
14389bc446