#615 is closed, should this TODO be removed?