Smaller and pickable to 1.x-master now, thanks @gibson042