Revert "Add next kernel as default for now"

This reverts commit 7b1b6bfb7c40a5004c13d6522f28f948b49bcc46.

Change-Id: I78cd28ca69151c45a3009cab74d0bd8ec21cbdf5