Can this change be done in a separate PR?