Revert "switch"

This reverts commit 7cecb916361336429cfb8c0c934ee05566a7dc7d.