Fix some issues with cinnamon and the recent libtool update
Revert "Fix some issues with cinnamon and the recent libtool update"

This reverts commit 7032eb840dc5251b2c5c588aa445777f3773ca2e.