This reverts commit 0f13918e4a72484cb434ab1fcb4860226d44270c.

Conflicts:
	mainwindow.cpp