Revert durty commits

This reverts commit 60793424fc9c20f1aa1071ce33562dcec3b1480a.