Revert "use wip branch temporarily for manta kernel"

This reverts commit 01017fab4da9683154e4c4e8e22d794105647bd8.