Revert "Small optimization for options form number of queries"

This reverts commit 454a221393297d983af796c9a22c85a180788b76.