Updates to faye/cb0e446.