Reimplementation as a plugin