> Hopefully, we can just revert this change when hp fixes its registration!

Indeed ;-) Is there some HP issue or ticket number we could reference here, so we can try to keep track of when this might no longer be needed..?