MDL-24339 workaround for broken parents in block instances