Revert 5c3262c..95e1c6d

This rolls back to commit 5c3262cf3eacb6ed078306f503b8db3bc4218b1f.