Partially revert commit 0c1cc3e.