Manually revert merge commit 7174e37b1c5daca139fa38fd0c01a95ae1691f80