Revert 4745de1..3964a2a

This rolls back to commit 4745de1b8b5bf362eca22215cd921fb9c9a6909d.