This reverts commit c3a4cff133, reversing changes made to 791a02e6e4. This change requires plugin recompilation and we should hold off until a minor release for that.
c3a4cff133
791a02e6e4