Block got re-added in Iecf6df041. Initially removed in I87f925ff2. Change-Id: I487d2465b8c412e357795dca6666a8179d2e56f3