Fix boot after: 7916defc49dd985fc233808be744681c74d4d8b5

closes #2316