Revert "Revert "Revert "rts/base: Fix #9423"" and resolve issue that caused the revert."

This reverts commit 55d2522bd0c48e4c5dac1526cdf53459270baf96.

Signed-off-by: Austin Seipp <austin@well-typed.com>