Revert "Revert 268c01c..6737faf"

This reverts commit d47bb8967d8caab391c959d913b85befa956082c.
Revert 268c01c..fa56b07

This rolls back to commit 268c01c39c9e4f3a05b1e4d675e95af588d95767.