Revert 663b5f4..283cc85

This rolls back to commit 663b5f4bc2f7358e43734c8f2cc82c47c0a51a83.