Revert some hunks from previous commit
Changes in folderspanel.cpp in 464b13f3828e5cdd03438d0881c3a62c7cda6333 were unintended.