Revert c77240a..add0d16

This rolls back to commit c77240aea13ea7268ae62a3f13a3f01881335545.
fgda