Revert [7925be01f] for now since with the other changes committed at the same time it's redundant.