Revert "Squashed commit of the following:"

This reverts commit 6c957d16f9ec2dc7d43a8fdf1f6a92de47f43714.