Revert commit 66140 since it caused several failures