Another fix (these commits will be squashed later; WIP on EC2).