#22; temporary reverted plugin implementations