Addresses #934 for the RDSE.

@rhyolight