Tackle the content blocks issue differently, in order to preserve the data, which is now useful since #7767