This reverts commit b20e34b3. This causes RAUW type mismatch assertions on some buildbots, reverting for now.