Reverted files to avoid pull conflicts