Addresses #934 for the RDSE.

See #934

@rhyolight please review