Revert "Squashed commit of the following:"

This reverts commit 3ba2284c21384e63124c3ccb78678c400b20eec5.