Revert "updated email and choice filed handling for use_as options"

This reverts commit eaf0312f77fae2db1ca118290eaf21e0f3f477e8.