Cleaner workaround for RM-203

Puts back the old code and uses a cleaner workaround suggested by Shizuo Fujita.