Revert 706c64e..e2e7680

This rolls back to commit 706c64e4d16dec591576f489f1e15cd511adf604.