Revert "Squashed commit of the following:"

This reverts commit f8173411cc612017ecfa115d71fb823b0714d982.
29 files changed