Initial patch to this fork.