Revert "is this version 2 again"

This reverts commit 42b38d37c7889d79b19c474aa4c6873dcd97a5d1.