Revert 08c2fca..e873692

This rolls back to commit 08c2fca7d0cbed336e444a6666c8bfa196d98fb9.