Revert "Squashed commit of the following:"

This reverts commit 12f2fb23d64bea03d2b763678c11d7c40671d7a2.