#544 simplifies this logic.