Revert "Still debugging"

This reverts commit fbc29579f212f88d657fa206cbb5706e4297933a.