Reverted change that caused bootloops