Revert "adds support for  in addition to  and"

This reverts commit 56613b98d7587c19cc60bc023f8ace1d97b45f09.