Revert "Squash the following commits"

This reverts commit 5c9454214f949376f09b4a0d817878d8fea9f197.