This reverts commit 5e55c15f. Conflicts: mediachanger/acs/AcsTest.cpp mediachanger/acs/CMakeLists.txt tests/CMakeLists.txt