Revert 9ac23e3..3ef3585

This rolls back to commit 9ac23e321608b3c55d221156fe5e443d148a517a.