No longer needed (see #98)