Revert "1 and"

This reverts commit 45c30e0aa53da28909563cc9008b5dac595e537f.