revering last commit. plugin_spec tests passing again.