Revert #92fe1ed