Reapply 154038 without the failing test.