This reverts commit 65f28f123e. Update moved to staging due to causing rebuilds on staging-next.
65f28f123e