This part feels easily separable from the rest of this change and should probably be committed ASAP. Unless we manage to push this through quickly I would recommend we break out this fix in to a separate PR and get it merged in to master.