Revert "Just -x"

This reverts commit 5b962939a96608addad40a299adbc93f8d328906.
Like this?