Revert "Revert "Hard reset to previous commit 66ebe27e3462044e1762d0127c3229bb2e6f63e4""

This reverts commit 4788d52cda86e41d72e3b1d8f86801470b45dab2.