Revert d1665aa..f85ea64

This rolls back to commit d1665aa4ec6e25a757ad31bf7d73213d4ee4ae61.
Revert "Revert d1665aa..f85ea64"

This reverts commit f0b5f24051eb6a9f73136efca2c43ad9278eed07.
Revert nov26

This rolls back to commit f79e09c3ad20506a61b3f342fafdc961cd527654.