Revert parts of 8d8cc8a9cced7cc9171cc09ce0fd024145605d70.