Drop faucet for 0.8 support.