Revert 6868f14..402e2f2

This rolls back to commit 6868f1447a5340a6a36c4ad542850ea77bb51710.