Port over to incompatible API introduced in 2.4
Merge branch 'fix-cinnamon-2.4-compatibility' into merge-all-the-things