Revert "Revert 7673ebe..5f09200"

This reverts commit 843b9945f4052e395db5d53c8340c3b015dbce72.
Revert 7673ebe..e25da37

This rolls back to commit 7673ebe44655d70d2dfac4b7933b402b2474b2cd.