Remove phone mail hack. No longer needed since 9354ab6