Reapply Mikko's rst fix