Revert a fix for #1418. One test breaks