Merge "Remove taint support"