Re-added parts that were lost in the merger.