Revert 927925d..beed540

This rolls back to commit 927925d67fc64896fd5b6db1902be43b220c982f.
Revert 68fce89..98fd7f9

This rolls back to commit 68fce899669cf34e03346245c861429a76918fec.
Reverted to a version a few days old.