Don't double-commit

A regression was added in I0c927530f9a0ef9f1e9f56dfbe616b5a72adbfc1
due to a bad merge-conflict resolution that caused Block instances
to be committed twice.

Change-Id: Ia5f6661f1d93ca7f68b1435a14622eba2aec2130