Accidentally commitedd a modified version of these two files, so I am now restoring their earlier versions