Merged in change to remove performance schema