Revert "Revert my previous commits"

This reverts commit 350c99782684d7983c10490bd6aa5b22d2f0f37d.