The workaround in our household CC: @frjon @ayjay