Revert "Mass Revert to cdb635a"