Merge "Revert "Disable XOM in init.""