Revert 39cc16fb9bd9bbc76315ba2a5271e5d5bdce0a41.