Revert by Simo's request. HEAD and 3.0 should be in sync for