Revert 06ed0fe..3b8d646

This rolls back to commit 06ed0fed28709ad9b35bd67542081ce5e0213058.