Revert fc179b2..16f3ce3

This rolls back to commit fc179b210f0ecca8372aa2833b01e33998517bae.
Revert "Revert fc179b2..16f3ce3"

This reverts commit 108077e3688981a90096ba9d86086c9c907b09db.