Reverting, will wait for plugin fix to merge this