Re-adding changes that weren't merged properly from previous merge.