Revert 70bf343..c6f21db

This rolls back to commit 70bf34388aad74c9801d3f32b2e5f62513c42b6b.