Revert "flipflop"

This reverts commit eccc93a8502ebb35b53985d46c0670fc9277a8c2.