Revert 800c2f5..f279766

This rolls back to commit 800c2f525d2b198777343547d30ba0fce75f7744.