Reverse Commit from aug 21 05:45 pm