Tracking issue for #1839, which was already merged. This issue is just so that we can track #1839 in the project board.