Waddlesplash reverted my original change so rework is in https://review.haiku-os.org/#/c/haiku/+/351/ and https://review.haiku-os.org/#/c/haiku/+/352/ now