Revert "merge of plugin2 to recent branch off master"

This reverts commit a2c0a1d842577ee5d0937b8db2278cdd96f46905.