Revert #c9d2659