Is this still necessary after your other PR?