Adopt to upstream Smack