This recovers results from 2.12. However, these results also are wrong.
(cherry picked from commit 8eef5273)