Revert 35c6ec2..95d82a6

This rolls back to commit 35c6ec2dde150234ee4b621f5b512a5cde770e4a.
Revert "Revert 35c6ec2..95d82a6"

This reverts commit bcbd677689b67f023c6766447e083bfb8134d19f.
Revert d93704b..96a0829

This rolls back to commit d93704b2a31c111fc950f7c6e0d28dbb18694526.
Revert c321ca7..84599d8

This rolls back to commit c321ca7720f1c878a039ba4c13448414f065ccc7.
Stuff