Merging back in changes that were reverted due to branching mistakes