Revert c067283..3781d37

This rolls back to commit c0672833139c05797c0e8522b9c669d4c6162207.