Restore automapping inherited behaviour