Revert 58ff078..7750fbc

This rolls back to commit 58ff078a6037f80056277f9bd947e70cc78c9214.