This reverts commit fa16329a. See comments in discussion. Merged by mistake, not entirely getting what the problem was.