re-apply Astrid's changes