Revert "Honour existing restrictions when regenerating the agenda"