Reverted changes to help merge