Revert a37716d..7930867

This rolls back to commit a37716d5ff0a86092d37e7b19cd04c4dbed57afd.