Just testing my commit from Mac

Restoring original code.