Revert "Commit it again pretty please?"

This reverts commit 7290e03a96780900500b1a7f8ec39c433e1b8ed1.
Revert "Revert "Commit it again pretty please?""

This reverts commit 497225e99f7d422272ec21da7304571ccae8453e.