I don't like this. Once #2644 gets merge, we will pass the updated block here instead of getting it manually from S3.