This PR is going to drive me crazy.