Revert c8e0111..fd23aa9

This rolls back to commit c8e011115c115ddcbb0e3953450f873258ca33b9.
Revert cf322da..8df4dd7

This rolls back to commit cf322daac37872891d45a094b05a40246a703d7e.