Revert d886d87..6f13495

This rolls back to commit d886d87ad35d95890dc83be51984cb6ada5e65af.
Revert "Revert d886d87..6f13495"

This reverts commit d14470bfe1fe55ac0e44a4371416aa6684993df3.