Revert "Similarily for plot2"

This reverts commit 8176c57ae700e196fed9c61708db2c6c51d6db7e.