Land #3416 again, now that the bins are available

This reverts commit 3d734145304f06cb3dbfe0a3f1771dd7650cf318.