Revert "Merge branch 'master' into topic/plot_layout_upload"

This reverts commit 9dc113d41d4faaf9657de3fa3918e28f119db7d4, reversing
changes made to ab0fb594476d01835dcdf57fc35ef83ea6c74d7d.