This reverts commit 283ade8e33. This was supposed to come as a collection of commits, not squashed into one.
283ade8e33