Switch constructor (way too slow)
Revert "Switch constructor (way too slow)"

This reverts commit a3e83fd93dd8268bd69e306e362372e8c54243fe.