Commit 7f58aabc36901 causes boot hang