Fixes #4686. Reverts redundant picklability code from r74544.
1 file changed